From 45eac368f0cc253609440f612cfe9089b7248bb1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20H=C3=A4rdeman?= Date: Wed, 15 Oct 2025 18:29:53 +0200 Subject: [PATCH] luci-mod-network: organize "dnssec" tab in dhcp/dns views MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Delete the tab from dhcp.js, sort the options that belong to it in dns.js. Signed-off-by: David Härdeman --- .../resources/view/network/dhcp.js | 14 ---------- .../luci-static/resources/view/network/dns.js | 28 ++++++++++--------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js index efd94d2586..4bbe8187fc 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js @@ -391,7 +391,6 @@ return view.extend({ s.tab('general', _('General')); s.tab('devices', _('Devices & Ports')); - s.tab('dnssecopt', _('DNSSEC')); s.tab('filteropts', _('Filter')); s.tab('forward', _('Forwards')); s.tab('limits', _('Limits')); @@ -670,19 +669,6 @@ return view.extend({ _('This prevents unreachable IPs in subnets not accessible to you.') + '
' + _('Note: IPv4 only.')); - if (L.hasSystemFeature('dnsmasq', 'dnssec')) { - o = s.taboption('dnssecopt', form.Flag, 'dnssec', - _('DNSSEC'), - _('Validate DNS replies and cache DNSSEC data, requires upstream to support DNSSEC.')); - o.optional = true; - - o = s.taboption('dnssecopt', form.Flag, 'dnsseccheckunsigned', - _('DNSSEC check unsigned'), - _('Verify unsigned domain responses really come from unsigned domains.')); - o.default = o.enabled; - o.optional = true; - } - s.taboption('filteropts', form.Flag, 'nonegcache', _('No negative cache'), _('Do not cache negative replies, e.g. for non-existent domains.')); diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js index 50dbd220ab..59d9f45f33 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dns.js @@ -769,6 +769,21 @@ return view.extend({ }; // End dnsrecords + // Begin dnssec + if (L.hasSystemFeature('dnsmasq', 'dnssec')) { + o = s.taboption('dnssecopt', form.Flag, 'dnssec', + _('DNSSEC'), + _('Validate DNS replies and cache DNSSEC data, requires upstream to support DNSSEC.')); + o.optional = true; + + o = s.taboption('dnssecopt', form.Flag, 'dnsseccheckunsigned', + _('DNSSEC check unsigned'), + _('Verify unsigned domain responses really come from unsigned domains.')); + o.default = o.enabled; + o.optional = true; + } + // End dnssec + s.taboption('filteropts', form.Flag, 'domainneeded', _('Domain required'), _('Never forward DNS queries which lack dots or domain parts.') + '
' + @@ -999,19 +1014,6 @@ return view.extend({ _('This prevents unreachable IPs in subnets not accessible to you.') + '
' + _('Note: IPv4 only.')); - if (L.hasSystemFeature('dnsmasq', 'dnssec')) { - o = s.taboption('dnssecopt', form.Flag, 'dnssec', - _('DNSSEC'), - _('Validate DNS replies and cache DNSSEC data, requires upstream to support DNSSEC.')); - o.optional = true; - - o = s.taboption('dnssecopt', form.Flag, 'dnsseccheckunsigned', - _('DNSSEC check unsigned'), - _('Verify unsigned domain responses really come from unsigned domains.')); - o.default = o.enabled; - o.optional = true; - } - s.taboption('filteropts', form.Flag, 'nonegcache', _('No negative cache'), _('Do not cache negative replies, e.g. for non-existent domains.')); -- 2.30.2